projects / gpsbabel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8e5b4fe)
update Qt 5.12 builds to 5.12.2. (#329)
authortsteven4 <tsteven4@users.noreply.github.com>
Sat, 16 Mar 2019 20:59:00 +0000 (14:59 -0600)
committerGitHub <noreply@github.com>
Sat, 16 Mar 2019 20:59:00 +0000 (14:59 -0600)
* update Qt 5.12 builds to 5.12.2.

* update coverage reporter, kill java8 in docker, add bear.

.travis.yml patch | blob | history
tools/Dockerfile patch | blob | history
tools/Dockerfile_qtio patch | blob | history
tools/make_windows_release.ps1 patch | blob | history
tools/travis_install_linux_coverage patch | blob | history
tools/travis_install_linux_local patch | blob | history
tools/travis_install_osx patch | blob | history
tools/travis_script_linux_coverage patch | blob | history

diff --git a/.travis.yml b/.travis.yml
index eed6b17df6acf9628fc9d6dda75f3c07b192d21b..6b498d95a9ca7043757b517a06b84259b8f0f57f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ matrix:
         timeout: 600
     - os: osx
       compiler: clang
-      env: QT_VERSION="5.12.1"
+      env: QT_VERSION="5.12.2"
       cache:
         directories:
           - $HOME/Cache
diff --git a/tools/Dockerfile b/tools/Dockerfile
index e2031e459c34dfa0e2a0873a0843882642104722..fda0206334b32fd7aa84bbce4a460163bdd9317e 100644 (file)
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -26,6 +26,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     valgrind \
     expat \
     libxml2-utils \
+    bear \
  && rm -rf /var/lib/apt/lists/*
 
 # alternative compiler
@@ -44,6 +45,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # pkgs with libraries needed by gpsbabel
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libusb-dev \
+    pkg-config \
+    libudev-dev \
  && rm -rf /var/lib/apt/lists/*
 
 # pkgs with qt used by gpsbabel
@@ -57,7 +60,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # pkgs needed to generate coverage report:
 RUN apt-get update && apt-get install -y --no-install-recommends \
     gcovr \
-    openjdk-8-jre-headless \
  && rm -rf /var/lib/apt/lists/*
 
 # install environment for locale test
diff --git a/tools/Dockerfile_qtio b/tools/Dockerfile_qtio
index dc478d78dc36f8ea9c1b25894c3ed1839e21281f..084c8e1955f9bae28e2afd6f7e5c15e077ea1412 100644 (file)
--- a/tools/Dockerfile_qtio
+++ b/tools/Dockerfile_qtio
@@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # basic build and test tools
 COPY ./qtci/install-qt ./qtci/extract-qt-installer /app/
-RUN QT_CI_PACKAGES=qt.qt5.5121.gcc_64,qt.qt5.5121.qtwebengine QT_CI_DOWNLOADER="wget -nv -c" PATH=/app:${PATH} ./install-qt 5.12.1 /opt
+RUN QT_CI_PACKAGES=qt.qt5.5122.gcc_64,qt.qt5.5122.qtwebengine QT_CI_DOWNLOADER="wget -nv -c" PATH=/app:${PATH} ./install-qt 5.12.2 /opt
 
 FROM ubuntu:bionic
 LABEL maintainer="https://github.com/tsteven4"
@@ -49,6 +49,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     valgrind \
     expat \
     libxml2-utils \
+    bear \
  && rm -rf /var/lib/apt/lists/*
 
 # alternative compiler
@@ -67,6 +68,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # pkgs with libraries needed by gpsbabel
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libusb-dev \
+    pkg-config \
+    libudev-dev \
  && rm -rf /var/lib/apt/lists/*
 
 # dependencies of Qt
@@ -80,14 +83,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  && rm -rf /var/lib/apt/lists/*
 
 # Qt
-COPY --from=qt_install /opt/qt-5.12.1.env /opt/qtio.env
-COPY --from=qt_install /opt/Qt/5.12.1 /opt/Qt/5.12.1
+COPY --from=qt_install /opt/qt-5.12.2.env /opt/qtio.env
+COPY --from=qt_install /opt/Qt/5.12.2 /opt/Qt/5.12.2
 COPY --from=qt_install /opt/Qt/Licenses /opt/Qt/Licenses
 
 # pkgs needed to generate coverage report:
 RUN apt-get update && apt-get install -y --no-install-recommends \
     gcovr \
-    openjdk-8-jre-headless \
  && rm -rf /var/lib/apt/lists/*
 
 # install environment for locale test
diff --git a/tools/make_windows_release.ps1 b/tools/make_windows_release.ps1
index 8a75af62fc200a978700a65843ab203164f8fcf1..b91d2c60cf225dce8f085693705cd5319ed3c5d4 100755 (executable)
--- a/tools/make_windows_release.ps1
+++ b/tools/make_windows_release.ps1
@@ -31,7 +31,7 @@ New-Item "$($gpsbabel_build_dir)" -type directory -force | Out-Null
 Set-Location "$($gpsbabel_build_dir)"\r
 switch ($flow) {\r
   "mingw"   { qmake "$($gpsbabel_src_dir)\GPSBabel.pro" -spec "win32-g++" }\r
-  # work around Qt 5.12.1 qmake bug.\r
+  # work around Qt 5.12.1, 5.12.2 qmake bug.\r
   #C:\Qt\5.12.1\msvc2017\bin\qmake.exe -tp vc GPSBabel.pro\r
   #WARNING: Could not parse Compiler option '-std:c++14'; added to AdditionalOptions.\r
   #WARNING: You can suppress these warnings with CONFIG+=suppress_vcproj_warnings.\r
diff --git a/tools/travis_install_linux_coverage b/tools/travis_install_linux_coverage
index 47974033962891f6cc8f1ad2c6a5652c53c3c901..1eee42d85f5885bd82684e5e32de602dd7a88f0f 100755 (executable)
--- a/tools/travis_install_linux_coverage
+++ b/tools/travis_install_linux_coverage
@@ -27,7 +27,7 @@ function validate() {
   )
 }
 
-QT_VERSION=${1:-5.12.1}
+QT_VERSION=${1:-5.12.2}
 QT_VERSION_SHORT=${QT_VERSION//./}
 
 # our expectation is that install-qt creates $QTDIR, $QTDIR/bin.
diff --git a/tools/travis_install_linux_local b/tools/travis_install_linux_local
index bf4fc21d68a4dd1b6cfdd3ba47d1b4eff88f5809..359a42cf6b0a9eaf0871d80b76f14e87a128cb0e 100755 (executable)
--- a/tools/travis_install_linux_local
+++ b/tools/travis_install_linux_local
@@ -27,7 +27,7 @@ function validate() {
   )
 }
 
-QT_VERSION=${1:-5.12.1}
+QT_VERSION=${1:-5.12.2}
 QT_VERSION_SHORT=${QT_VERSION//./}
 
 # our expectation is that install-qt creates $QTDIR, $QTDIR/bin.
diff --git a/tools/travis_install_osx b/tools/travis_install_osx
index dc93015387446396b488b41f628a57cd14aa4a78..fa0a8dc937b58628ae7b612af3c4f7eda411a84a 100755 (executable)
--- a/tools/travis_install_osx
+++ b/tools/travis_install_osx
@@ -27,7 +27,7 @@ function validate() {
   )
 }
 
-QT_VERSION=${1:-5.12.1}
+QT_VERSION=${1:-5.12.2}
 QT_VERSION_SHORT=${QT_VERSION//./}
 
 # our expectation is that install-qt creates $QTDIR, $QTDIR/bin.
diff --git a/tools/travis_script_linux_coverage b/tools/travis_script_linux_coverage
index 15d9924cc1223b9b4a32d856d92a17f7ab6cb015..eabc4fa2ebb83e78ca257753df84013cb6136bb3 100755 (executable)
--- a/tools/travis_script_linux_coverage
+++ b/tools/travis_script_linux_coverage
@@ -4,6 +4,7 @@
 
 # extra ubuntu bionic packages: gcovr, openjdk-8-jre-headless, /usr/lib/jvm/java-8-openjdk-amd64/bin/java
 # as of 6/18/2018 you must use java 8, see issue #76, #83 at https://github.com/codacy/codacy-coverage-reporter/issues
+# as of 3/16/2019 with coverage reporter 4.0.3 java 8 is not required.
 
 qmake
 make coverage
@@ -16,8 +17,8 @@ make coverage
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 if [ -v CODACY_PROJECT_TOKEN ] ; then
   # upload coverate report to codacy.
-  wget -nv -c https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/4.0.3/codacy-coverage-reporter-4.0.3-assembly.jar
-  java -jar codacy-coverage-reporter-4.0.3-assembly.jar report -l cpp -f -r gpsbabel_coverage.xml
+  wget -nv -c https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/4.0.5/codacy-coverage-reporter-4.0.5-assembly.jar
+  java -jar codacy-coverage-reporter-4.0.5-assembly.jar report -l cpp -f -r gpsbabel_coverage.xml
 else
   echo "Skipping codacy coverage upload as CODACY_PROJECT_TOKEN is not set."
 fi
Unnamed repository; edit this file 'description' to name the repository.